Merge branch 'master' into bmx6_testing
authorAxel Neumann <[email protected]>
Sat, 8 Jun 2013 15:28:57 +0000 (17:28 +0200)
committerAxel Neumann <[email protected]>
Sat, 8 Jun 2013 15:28:57 +0000 (17:28 +0200)
Conflicts:
bmx6/Makefile


Trivial merge